Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 14 Nov 2011 03:07:14 +0000 (19:07 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 14 Nov 2011 03:07:14 +0000 (19:07 -0800)
commit114b6d007d1eb9627cc7dedac0891016c786a393
tree4174993911d458bc6fc76149c76fcd70d756df0e
parenta604ea9ec377ea21418615a70d5ba5d055cd3c1b
parentfe82f14ff28373f84ba4ccee2d1cd8622d0dd77c
Merge from trunk.